Skip to content

os_string fixes for cross-compilation and Android when Swift is enabled #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2017

Conversation

gonzalolarralde
Copy link
Contributor

Two different issues were affecting the use and generation of output directories for libraries.

  • os_string wasn't resolving android for the linux-androideabi target OS
  • Installation directory for cross-compiled target is malformed.

To fix the latter, I'm now passing OS_STRING and using host_cpu instead of build_cpu.

linux was hardcoded, now we use OS_STRING generated in configure.ac.
Also, the build_cpu instead of the host_cpu was used for swiftmoddir,
resulting in an incorrect destination directory.
@MadCoder MadCoder merged commit 353adba into swiftlang:master Jan 4, 2017
das pushed a commit that referenced this pull request Feb 21, 2017
os_string fixes for cross-compilation and Android when Swift is enabled

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants